From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Nov 2012 02:46:21 +0000 (-0800)
Subject: Merge 3.7-rc6 into usb-next.
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~9834^2~38
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0c864d8b3e51bd61f43484268c9aa4eb9a199b02;p=linux-4.9.git

Merge 3.7-rc6 into usb-next.

This resolves a conflict with these files:
	drivers/usb/early/ehci-dbgp.c
	drivers/usb/host/ehci-ls1x.c
	drivers/usb/host/ohci-xls.c
	drivers/usb/musb/ux500.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

0c864d8b3e51bd61f43484268c9aa4eb9a199b02